Revision: tlasrc--backbuild--1--patch-10
Archive: aaron.bentley@utoronto.ca--tla-2004
Creator: Aaron Bentley <aaron.bentley@utoronto.ca>
Date: Sat Mar  6 16:26:53 EST 2004
Standard-date: 2004-03-06 21:26:53 GMT
New-files: libarch/.arch-ids/cmd-rm.c.id libarch/cmd-rm.c
    libarch/cmd-rm.h tests/.arch-ids/test-rm-explicit.sh.id
    tests/test-rm-explicit.sh
Renamed-files: tests/test-mirror-creation.sh tests/test-mirror.sh
Modified-files: ChangeLog libarch/archive-mirror.c
    libarch/build-revision.c libarch/cmd-abrowse.c
    libarch/cmd-add-id.c libarch/cmd-add-log-version.c
    libarch/cmd-add-pristine.c libarch/cmd-ancestry-graph.c
    libarch/cmd-ancestry.c libarch/cmd-apply-changeset.c
    libarch/cmd-apply-delta.c libarch/cmd-archive-fixup.c
    libarch/cmd-archive-meta-info.c
    libarch/cmd-archive-mirror.c
    libarch/cmd-archive-setup.c
    libarch/cmd-archive-snapshot.c
    libarch/cmd-archive-version.c libarch/cmd-archives.c
    libarch/cmd-branches.c libarch/cmd-build-config.c
    libarch/cmd-cachedrevs.c libarch/cmd-cacherev.c
    libarch/cmd-cat-archive-log.c libarch/cmd-cat-config.c
    libarch/cmd-cat-log.c libarch/cmd-categories.c
    libarch/cmd-changelog.c libarch/cmd-changes.c
    libarch/cmd-changeset.c libarch/cmd-commit.c
    libarch/cmd-default-id.c libarch/cmd-delete-id.c
    libarch/cmd-delta.c libarch/cmd-file-diffs.c
    libarch/cmd-file-find.c libarch/cmd-find-pristine.c
    libarch/cmd-get-changeset.c libarch/cmd-get.c
    libarch/cmd-grab.c libarch/cmd-help.c
    libarch/cmd-id-tagging-defaults.c
    libarch/cmd-id-tagging-method.c libarch/cmd-id.c
    libarch/cmd-import.c libarch/cmd-init-tree.c
    libarch/cmd-inventory.c libarch/cmd-join-branch.c
    libarch/cmd-library-add.c
    libarch/cmd-library-archives.c
    libarch/cmd-library-branches.c
    libarch/cmd-library-categories.c
    libarch/cmd-library-config.c libarch/cmd-library-file.c
    libarch/cmd-library-find.c libarch/cmd-library-log.c
    libarch/cmd-library-remove.c
    libarch/cmd-library-revisions.c
    libarch/cmd-library-versions.c
    libarch/cmd-lock-pristine.c libarch/cmd-lock-revision.c
    libarch/cmd-log-for-merge.c libarch/cmd-log-versions.c
    libarch/cmd-logs.c libarch/cmd-make-archive.c
    libarch/cmd-make-branch.c libarch/cmd-make-category.c
    libarch/cmd-make-log.c libarch/cmd-make-version.c
    libarch/cmd-merges.c libarch/cmd-missing.c
    libarch/cmd-move-id.c libarch/cmd-mv.c
    libarch/cmd-my-default-archive.c libarch/cmd-my-id.c
    libarch/cmd-my-revision-library.c
    libarch/cmd-new-merges.c
    libarch/cmd-parse-package-name.c
    libarch/cmd-pristines.c libarch/cmd-rbrowse.c
    libarch/cmd-redo.c libarch/cmd-register-archive.c
    libarch/cmd-remove-log-version.c libarch/cmd-replay.c
    libarch/cmd-revisions.c libarch/cmd-set-tree-version.c
    libarch/cmd-show-changeset.c libarch/cmd-star-merge.c
    libarch/cmd-sync-tree.c libarch/cmd-tag.c
    libarch/cmd-tree-lint.c libarch/cmd-tree-root.c
    libarch/cmd-tree-version.c libarch/cmd-uncacherev.c
    libarch/cmd-undo.c libarch/cmd-update.c
    libarch/cmd-valid-package-name.c libarch/cmd-versions.c
    libarch/cmd-whereis-archive.c libarch/cmds.c
    libarch/cmdutils.c libarch/inv-ids.c libarch/libraries.c
    libarch/libraries.h libarch/library-txn.c
    libarch/local-cache.c libarch/pfs-ftp.c
    libfsutils/ensure-dir.c libfsutils/ensure-dir.h
    tests/Makefile.in tests/test-file-diffs.sh
    tests/test-framework tests/test-mirror.sh
    tests/test-what-changed.sh
New-patches: aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-35
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-10
    johannes@sipsolutions.de--2004/tla--revlib-fix--1.2--base-0
    johannes@sipsolutions.de--2004/tla--revlib-fix--1.2--patch-1
    lord@emf.net--2004/tla--devo--1.2--patch-95
    lord@emf.net--2004/tla--devo--1.2--patch-96
    lord@emf.net--2004/tla--devo--1.2--patch-97
    lord@emf.net--2004/tla--devo--1.2--patch-98
    lord@emf.net--2004/tla--devo--1.2--patch-99
    lord@emf.net--2004/tla--devo--1.2--patch-101
    lord@emf.net--2004/tla--devo--1.2--patch-103
    lord@emf.net--2004/tla--devo--1.2--patch-106
    lord@emf.net--2004/tla--devo--1.2--patch-108
    lord@emf.net--2004/tla--devo--1.2--patch-109
    lord@emf.net--2004/tla--devo--1.2--patch-110
    lord@emf.net--2004/tla--devo--1.2--patch-111
    lord@emf.net--2004/tla--devo--1.2--patch-112
    lord@emf.net--2004/tla--devo--1.2--patch-113
    lord@emf.net--2004/tla--devo--1.2--patch-114
    lord@emf.net--2004/tla--devo--1.2--patch-115
    rbtcollins@hotmail.com--barch/tla--integration--1.2--patch-20
    rbtcollins@hotmail.com--barch/tla--integration--1.2--patch-21
    rbtcollins@hotmail.com--barch/tla--mirror--1.2--base-0
    rbtcollins@hotmail.com--barch/tla--mirror--1.2--patch-1
    rbtcollins@hotmail.com--barch/tla--mirror--1.2--patch-2
    rbtcollins@hotmail.com--barch/tla--mirror--1.2--patch-3
    sam@rfc1149.net--public/tla--sam--1.2--patch-4
    sam@rfc1149.net--public/tla--sam--1.2--patch-12
    stefie10@alum.mit.edu--2004/tla--devo--1.2--base-0
    stefie10@alum.mit.edu--2004/tla--devo--1.2--patch-1
    stefie10@alum.mit.edu--2004/tla--devo--1.2--patch-2
    tez@kamihira.com--2004s/tla--OP2-eliminate--0.1--base-0
    tez@kamihira.com--2004s/tla--OP2-eliminate--0.1--patch-1
    tez@kamihira.com--2004s/tla--OP2-eliminate--0.1--patch-2
    tez@kamihira.com--2004s/tla--OP2-eliminate--0.1--patch-3
    tez@kamihira.com--2004s/tla--OP2-eliminate--0.1--patch-4
Summary: Merges from Robert, conflict fixes
Keywords: 

Patches applied:

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-35
   Merged with Robert, fixed the first build-revision conflict

 * johannes@sipsolutions.de--2004/tla--revlib-fix--1.2--base-0
   tag of lord@emf.net--2004/tla--devo--1.2--patch-71

 * johannes@sipsolutions.de--2004/tla--revlib-fix--1.2--patch-1
   fix library-remove

 * lord@emf.net--2004/tla--devo--1.2--patch-95
   fix comment-syntax

 * lord@emf.net--2004/tla--devo--1.2--patch-96
   test script fixes (Toby White)

 * lord@emf.net--2004/tla--devo--1.2--patch-97
   fix return type of ensure_directory_exists (Johannes Berg)

 * lord@emf.net--2004/tla--devo--1.2--patch-98
   allow library-remove to remove horked revisions (Johannes Berg)

 * lord@emf.net--2004/tla--devo--1.2--patch-99
   OP->OP2 changes (tez)

 * lord@emf.net--2004/tla--devo--1.2--patch-101
   added missing flush (Johannes Berg)

 * lord@emf.net--2004/tla--devo--1.2--patch-103
   fix bogus format string

 * lord@emf.net--2004/tla--devo--1.2--patch-106
   fix compiler warning

 * lord@emf.net--2004/tla--devo--1.2--patch-108
   fix compiler warning

 * lord@emf.net--2004/tla--devo--1.2--patch-109
   help message tweaks (Jani Monoses)

 * lord@emf.net--2004/tla--devo--1.2--patch-110
   rm command (Stefanie Tellex)

 * lord@emf.net--2004/tla--devo--1.2--patch-111
   fix compiler warnings

 * lord@emf.net--2004/tla--devo--1.2--patch-112
   tla changes cli bugfix (versionspecs) (Samuel Tardieu)

 * lord@emf.net--2004/tla--devo--1.2--patch-113
   fix inventory help message (Yani Monoses)

 * lord@emf.net--2004/tla--devo--1.2--patch-114
   use the configure gnu-tar, not tar, in tests (savannah bug 7853)

 * lord@emf.net--2004/tla--devo--1.2--patch-115
   descriptor leak fix (Johannes Berg)

 * rbtcollins@hotmail.com--barch/tla--integration--1.2--patch-20
   merge with lord@emf.net--2004/tla--devo--1.2

 * rbtcollins@hotmail.com--barch/tla--integration--1.2--patch-21
   merge archive mirror cacherev management support from rbtcollins@hotmail.com--barch/tla--mirror--1.2

 * rbtcollins@hotmail.com--barch/tla--mirror--1.2--base-0
   tag of rbtcollins@hotmail.com--barch/tla--integration--1.2--patch-20

 * rbtcollins@hotmail.com--barch/tla--mirror--1.2--patch-1
   test archive-mirror behaviour w.r.t. cached revisions

 * rbtcollins@hotmail.com--barch/tla--mirror--1.2--patch-2
   factor out cache rev copying to mirrors, and add cached revisions to existing mirrored revisions

 * rbtcollins@hotmail.com--barch/tla--mirror--1.2--patch-3
   remove cached revisions in archive-mirror when appropriate

 * sam@rfc1149.net--public/tla--sam--1.2--patch-4
   Fix behaviour of 'tla changes versionspec'

 * sam@rfc1149.net--public/tla--sam--1.2--patch-12
   Add test for bug fixed in sam@rfc1149.net--public/tla--sam--1.2--patch-4

 * stefie10@alum.mit.edu--2004/tla--devo--1.2--base-0
   tag of lord@emf.net--2004/tla--devo--1.2--patch-100

 * stefie10@alum.mit.edu--2004/tla--devo--1.2--patch-1
   Implemented "tla rm" 

 * stefie10@alum.mit.edu--2004/tla--devo--1.2--patch-2
   Adding cmd-rm.c

 * tez@kamihira.com--2004s/tla--OP2-eliminate--0.1--base-0
   tag of lord@emf.net--2004/tla--devo--1.2--patch-61

 * tez@kamihira.com--2004s/tla--OP2-eliminate--0.1--patch-1
   sample code for OP2() elimination stuff.

 * tez@kamihira.com--2004s/tla--OP2-eliminate--0.1--patch-2
   tla update lord@emf.net--2004/tla--devo--1.2

 * tez@kamihira.com--2004s/tla--OP2-eliminate--0.1--patch-3
   breath.

 * tez@kamihira.com--2004s/tla--OP2-eliminate--0.1--patch-4
   OP2() elimination. Done.

